Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Wed, 10 Feb 2010 07:47:34 +0000 (08:47 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 10 Feb 2010 07:47:34 +0000 (08:47 +0100)
commit0bc63ba4fb2245a8bba2486be3bdb3d1c51f6c8a
tree93792ef95575eb7a2cb2a38bcb49f804496b2316
parent98e81e596bbfa174eb4ee59c1b388f49936e3226
parenteab25ae163c618384b22204b5f90932124069ec4
Merge from trunk